Add Valve-220 map format support to quemap. by skies912 · Pull Request #831 · jdolan/quetoo

skies912 · 2026-06-11T00:24:44Z

Auto-detects Valve-220 by peeking for '[' after the texture name; falls back to standard Q3 format if not present. Both formats are supported transparently with no flags required.

Ran into issues aligning faces in cavern - this helps. TB support for patch editing is coming too, which will also help alot.

Auto-detects Valve-220 by peeking for '[' after the texture name; falls back to standard Q3 format if not present. Both formats are supported transparently with no flags required. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Copilot

Pull request overview

This PR adds transparent support for Valve-220 (“explicit texture axes”) brush-side texture mapping in quemap, auto-detecting Valve-220 syntax in .map files and adjusting texture vector generation accordingly to improve face alignment (e.g., in cavern).

Changes:

Detect Valve-220 brush-side syntax during map parsing by peeking for [ after the texture name.
Add a brush_side_t::valve flag and generate texture vectors differently when Valve-220 axes are present.
Print a simple “Map format” note during qbsp compilation based on whether any Valve-220 sides were detected.

Reviewed changes

Copilot reviewed 4 out of 4 changed files in this pull request and generated 3 comments.

File	Description
src/quemap/map.c	Adds Valve-220 vs standard format detection and parsing for brush-side texture parameters.
src/quemap/map.h	Extends `brush_side_t` with a `valve` flag indicating Valve-220 axis usage.
src/quemap/texture.c	Adds Valve-220-specific texture vector handling using explicit axes.
src/quemap/qbsp.c	Prints the detected map format after loading the map.

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

jdolan · 2026-06-16T03:33:15Z

This is great! But before we can merge it, we need to think this through.

What are the implications to the editor? Does it need to be able to write v220 .map? Does it actually Just Work because it uses raw string copies of the brushes to begin with?

Should we create a script that just converts all of our .maps to v220, if it's a superior format?

Do we need to adjust our TrenchBroom config to tell it that we support / prefer v220?

skies912 · 2026-06-16T12:49:31Z

This is great! But before we can merge it, we need to think this through.

What are the implications to the editor? Does it need to be able to write v220 .map? Does it actually Just Work because it uses raw string copies of the brushes to begin with?

Should we create a script that just converts all of our .maps to v220, if it's a superior format?

Do we need to adjust our TrenchBroom config to tell it that we support / prefer v220?

I just tested it. Seems to "just work". I even deleted the .map and let the editor replace it. One note: TB won't immediately recognize the newly written .map BUT it's cosmetic. // Format: Quake3 (Valve) is needed up top for 220 loading. After I changed it, map loads and compiles just fine after that.
It's def a better format when it's needed. We -could- use a script to convert all the maps - it didn't take much on Claude's end to make a python script for it.
Yes. Though it's a simple one liner in GameConfig.cfg:

"fileformats": [
        { "format": "Quake3" },
		{ "format": "Quake3 (Valve)" }
    ],

jdolan · 2026-06-16T13:14:40Z

I think you've actually got this one. You should go for it.

I would generate the script, version it in Quetoo's map-fu folder maybe? Or add it to map-fu itself? Then convert and rebake all .maps. And update the TrenchBroom and Radiant configs. I'll open a PR against TB proper for you once this is all working and merged.

You got this! 💪🏻😎

Detect Valve-220 brush sides by peeking for '[' after the texture name, parse the explicit S/T texture axes into side->axis, and compute texture vectors directly from those axes in TextureVectorsForBrushSide. Falls back to standard Q1/Q3 shift/rotate/scale parsing otherwise. quemap reports the detected format ("Quake3 (Valve)" vs "Quake3"). Re-homed onto current main; supersedes the stale feature/valve220-map-format branch (fork point f708ff0). Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

…an/quetoo into feature/valve220-map-format

BSP tree and portal generation recurse to the depth of the BSP tree (BuildTree_r, MakeTreePortals_r). On large maps the tree is deep enough to overflow the default 1 MB Windows main-thread stack, crashing quemap with an access violation in the portal pass (e.g. cavern.map). Linux and macOS give the main thread ~8 MB by default, so this only affected the Windows build. Set /STACK reserve to 8 MB to match. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

jdolan

Almost there! We'll need a second PR in quetoo-data that updates scripts/map-fu to convert legacy to v220 as part of its preprocessing step. This will ensure that the Makefile in quetoo-data continues to function while also seamlessly updating the .map files.

jdolan · 2026-06-16T21:44:26Z

+      <!-- BSP tree/portal generation recurses to tree depth; the default 1 MB Windows
+           main-thread stack overflows on large maps (e.g. cavern). Reserve 8 MB to match
+           the Linux/macOS main-thread default. -->
+      <StackReserveSize>8388608</StackReserveSize>


🤣 Oh, fucking Windows...

jdolan · 2026-06-16T21:48:08Z

+  /**
+   * @brief True if this brush side uses Valve-220 explicit texture axes.
+   */
+  bool valve;


I think this boolean probably belongs as a global, right? We'd never encounter a .map file that uses some Valve brushes and some legacy / standard brushes, right?

jdolan · 2026-06-16T21:50:15Z


  LoadMapFile(map_name);

+  bool valve = false;


Yea, what probably makes sense here is to introduce

typedef enum { MAP_QUAKE2, MAP_VALVE_220 } map_format_t;

And have LoadMapFile return the resolved format, which you can set a global to.

map_format = LoadMapFile(map_name);

And then everywhere downstream can just check map_format

jdolan · 2026-06-16T21:50:30Z

+      break;
+    }
+  }
+  Com_Print("Map format: %s\n", valve ? "Quake3 (Valve)" : "Quake3");


Com_Verbose.

jdolan · 2026-06-16T21:50:59Z

 */
 void TextureVectorsForBrushSide(brush_side_t *side, const vec3_t origin) {

+  if (side->valve) {


if (map_format == MAP_VALVE_220) {

- Added an error path to map format selection to -make sure- mixed format .map files don't get processed. Even though it should never happen. - also bumped the phone max face count because kept getting spam from quemap about my crystal clusters :|

jdolan

Woohoo! Some super minor feedback, feel free to address, or not. This is approved.

jdolan · 2026-06-18T04:12:55Z

    <LocalDebuggerCommandArguments>-p "C:\Users\chrisg\OneDrive\Documents\My Games\Quetoo\default" -bsp test</LocalDebuggerCommandArguments>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <LocalDebuggerCommandArgumentsHistory>-p "D:\quetoo_dev\github\quetoo\Quetoo.vs15\../../quetoo-data/src/default" -bsp -light tokays|-p "C:\Users\chrisg\OneDrive\Documents\My Games\Quetoo\default" -bsp test|-p "C:\Users\chrisg\OneDrive\Documents\My Games\Quetoo\default" -bsp longyard|-p "C:\Users\chrisg\OneDrive\Documents\My Games\Quetoo\default" -bsp maps/longyard|</LocalDebuggerCommandArgumentsHistory>


I'm guessing this whole file should be .gitignored? But I'm not going to lose sleep over it.

if we can just gitnore that ONE section (well ALL sections with "LocalDebugger*", that would be awesome - that seems to change each commit 👎 . The rest is relevant.

jdolan · 2026-06-18T04:14:26Z

 }

-#define MAX_VERTEX_FACES 32
+#define MAX_VERTEX_FACES 64


64 faces sharing one vertex? You crazy bastard.. what're you doing?

Clusters of like this produced alot of warning spam in quemap - apparently didn't like verts so close together... SHUT UP. lol

jdolan · 2026-06-18T04:15:34Z

+ * @return The resolved map format, also stored in the global `map_format`.
 */
-void LoadMapFile(const char *filename) {
+int LoadMapFile(const char *filename) {


uber-nit: should return the enum type here.

@jdolan

- @jdolan 's Nitpick is correct.

Add Valve-220 map format support to quemap.

8248995

Auto-detects Valve-220 by peeking for '[' after the texture name; falls back to standard Q3 format if not present. Both formats are supported transparently with no flags required. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

jdolan requested a review from Copilot June 11, 2026 15:18

Copilot started reviewing on behalf of jdolan June 11, 2026 15:18 View session

Copilot AI reviewed Jun 11, 2026

View reviewed changes

Comment thread src/quemap/texture.c Outdated

Comment thread src/quemap/map.c Outdated

Comment thread src/quemap/map.c Outdated

jdolan and others added 3 commits June 12, 2026 08:45

Potential fix for pull request finding

321b356

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Potential fix for pull request finding

57352fc

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

Potential fix for pull request finding

e7b59e0

Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>

skies912 and others added 4 commits June 16, 2026 16:13

Merge branch 'feature/valve220-map-format' of https://github.com/jdol…

e9f7cdf

…an/quetoo into feature/valve220-map-format

Merge branch 'main' into feature/valve220-map-format

0eebee1

jdolan reviewed Jun 16, 2026

View reviewed changes

Fixes from PR comments

48dfdb8

- Added an error path to map format selection to -make sure- mixed format .map files don't get processed. Even though it should never happen. - also bumped the phone max face count because kept getting spam from quemap about my crystal clusters :|

jdolan approved these changes Jun 18, 2026

View reviewed changes

Return for LoadMapFile() should be map_format_t not int

d50b78c

- @jdolan 's Nitpick is correct.

skies912 added the component:quemap label Jun 18, 2026

skies912 merged commit 049cf7b into main Jun 18, 2026
4 checks passed

Uh oh!

Conversation

skies912 commented Jun 11, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Uh oh!

Uh oh!

Uh oh!

jdolan commented Jun 16, 2026

Uh oh!

skies912 commented Jun 16, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jdolan commented Jun 16, 2026

Uh oh!

jdolan left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

jdolan left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

skies912 Jun 18, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

skies912 commented Jun 16, 2026 •

edited

Loading

skies912 Jun 18, 2026 •

edited

Loading